bitkeeper revision 1.1236.1.188 (424d5d9bWJxugg2qyufAbqW_Iw8ing)

Fix 2.4 build.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c
index 002eb0abd1db9485c9134066fe029dd5d8faf05e..c13d1b184314f625976fd2f90e61b9c79cd4530a 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c
@@ -13,10 +13,11 @@
 #include <linux/pci.h>
 #include <linux/version.h>
 #include <asm/io.h>
-#include <asm/tlbflush.h>
 #include <asm-xen/balloon.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#include <asm/tlbflush.h>
+#else
 #define pte_offset_kernel pte_offset
 #define pud_t pgd_t
 #define pud_offset(d, va) d

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c
index d34fd71f8ec6b53c552be06514afbb107fc692a7..f09e2ab4f0216c07ee258bd8be3f2a404cfbf0f1 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c
@@ -33,11 +33,11 @@
 #include <linux/vmalloc.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/tlbflush.h>
 #include <asm-xen/hypervisor.h>
 #include <asm-xen/balloon.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux/percpu.h>
+#include <asm/tlbflush.h>
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)